bitkeeper revision 1.1159.1.415 (4195dc7etTtvj4twOJH5_vELAFyETw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp

diff --cc .rootkeys
Simple merge

diff --cc linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
Simple merge

diff --cc linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c
Simple merge

diff --cc linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
index 1bc1fc9a49b9b523876941ab531c73e83711fa5c,a4930a09d577939f5402e190c378668ef12d0bb7..d1edbc9e794e5e08164f5b0ff240c1c7cbd025dc
--- 1/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
--- 2/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
+++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
@@@ -46,10 -48,8 +46,10 @@@
  void evtchn_do_upcall(struct pt_regs *regs);
  
  /* Entry point for notifications into the userland character device. */
- void evtchn_device_upcall(int port);
+ asmlinkage void evtchn_device_upcall(int port);
  
 +#ifdef XEN_EVTCHN_MASK_OPS
 +
  static inline void mask_evtchn(int port)
  {
      shared_info_t *s = HYPERVISOR_shared_info;

diff --cc xen/arch/x86/traps.c
Simple merge

diff --cc xen/common/keyhandler.c
Simple merge

diff --cc xen/drivers/char/console.c
Simple merge